[IA64] Quieter boot

First pass at setting log levels to reduce output during Xen boot
and eliminate Xen output during normal domU boot.  Use loglvl= and
guest_loglvl= to re-enable full logging.

Signed-off-by: Alex Williamson <alex.williamson@hp.com>

diff --git a/xen/arch/ia64/xen/dom_fw.c b/xen/arch/ia64/xen/dom_fw.c
index bc04d21b2a6a99ce6db5aa5b9686eae0079cd175..c69ab89c80d455b84f65518428bcfdff95549b85 100644 (file)
--- a/xen/arch/ia64/xen/dom_fw.c
+++ b/xen/arch/ia64/xen/dom_fw.c
@@ -198,15 +198,16 @@ print_md(efi_memory_desc_t *md)
 {
        u64 size;
        
-       printk("dom mem: type=%2u, attr=0x%016lx, range=[0x%016lx-0x%016lx) ",
+       printk(XENLOG_INFO "dom mem: type=%2u, attr=0x%016lx, "
+              "range=[0x%016lx-0x%016lx) ",
               md->type, md->attribute, md->phys_addr,
               md->phys_addr + (md->num_pages << EFI_PAGE_SHIFT));
 
        size = md->num_pages << EFI_PAGE_SHIFT;
        if (size > ONE_MB)
-               printk ("(%luMB)\n", size >> 20);
+               printk("(%luMB)\n", size >> 20);
        else
-               printk ("(%luKB)\n", size >> 10);
+               printk("(%luKB)\n", size >> 10);
 }
 
 static u32 lsapic_nbr;
@@ -754,11 +755,11 @@ dom_fw_init(struct domain *d,
                }
                printk("\n");
        } else {
-               printk("DomainU EFI build up:");
+               printk(XENLOG_GUEST XENLOG_INFO "DomainU EFI build up:");
 
                tables->efi_tables[i].guid = ACPI_20_TABLE_GUID;
                tables->efi_tables[i].table = FW_ACPI_BASE_PADDR;
-               printk(" ACPI 2.0=0x%lx",tables->efi_tables[i].table);
+               printk(" ACPI 2.0=0x%lx", tables->efi_tables[i].table);
                i++;
                printk("\n");
        }

diff --git a/xen/arch/ia64/xen/domain.c b/xen/arch/ia64/xen/domain.c
index 97a844c17efac23f1eeea951ef35f6fef36d781d..1094f4c7f105f926fe16eb3b5760c02d23cad0cf 100644 (file)
--- a/xen/arch/ia64/xen/domain.c
+++ b/xen/arch/ia64/xen/domain.c
@@ -519,7 +519,7 @@ int arch_domain_create(struct domain *d)
 
 #ifdef CONFIG_XEN_IA64_PERVCPU_VHPT
        d->arch.has_pervcpu_vhpt = opt_pervcpu_vhpt;
-       dprintk(XENLOG_WARNING, "%s:%d domain %d pervcpu_vhpt %d\n",
+       dprintk(XENLOG_INFO, "%s:%d domain %d pervcpu_vhpt %d\n",
                __func__, __LINE__, d->domain_id, d->arch.has_pervcpu_vhpt);
 #endif
        if (tlb_track_create(d) < 0)
@@ -547,7 +547,7 @@ int arch_domain_create(struct domain *d)
        d->arch.ioport_caps = rangeset_new(d, "I/O Ports",
                                           RANGESETF_prettyprint_hex);
 
-       printk ("arch_domain_create: domain=%p\n", d);
+       dprintk(XENLOG_DEBUG, "arch_domain_create: domain=%p\n", d);
        return 0;
 
 fail_nomem:
@@ -765,7 +765,7 @@ domain_set_shared_info_va (unsigned long va)
 
        /* Note: this doesn't work well if other cpus are already running.
           However this is part of the spec :-)  */
-       printk ("Domain set shared_info_va to 0x%016lx\n", va);
+       gdprintk(XENLOG_DEBUG, "Domain set shared_info_va to 0x%016lx\n", va);
        d->arch.shared_info_va = va;
 
        VCPU(v, interrupt_mask_addr) = (unsigned char *)va +

diff --git a/xen/arch/ia64/xen/hypercall.c b/xen/arch/ia64/xen/hypercall.c
index 0a0890c28f61e45a09bbb5e000437a4950415277..15cda5a1339ee9030b13fff427fa239f85349379 100644 (file)
--- a/xen/arch/ia64/xen/hypercall.c
+++ b/xen/arch/ia64/xen/hypercall.c
@@ -105,8 +105,8 @@ fw_hypercall_ipi (struct pt_regs *regs)
                if (test_and_clear_bit(_VCPUF_down,
                                       &targ->vcpu_flags)) {
                        vcpu_wake(targ);
-                       printk ("arch_boot_vcpu: vcpu %d awaken\n",
-                               targ->vcpu_id);
+                       printk(XENLOG_INFO "arch_boot_vcpu: vcpu %d awaken\n",
+                              targ->vcpu_id);
                }
                else
                        printk ("arch_boot_vcpu: huu, already awaken!\n");

diff --git a/xen/arch/ia64/xen/regionreg.c b/xen/arch/ia64/xen/regionreg.c
index b4d1d56b9708587155723559090fa0d4c060f2b4..4b64bd99687c023b9bd3b9599fbf36649096eeca 100644 (file)
--- a/xen/arch/ia64/xen/regionreg.c
+++ b/xen/arch/ia64/xen/regionreg.c
@@ -185,9 +185,9 @@ int allocate_rid_range(struct domain *d, unsigned long ridbits)
        d->arch.metaphysical_rr0 = allocate_metaphysical_rr(d, 0);
        d->arch.metaphysical_rr4 = allocate_metaphysical_rr(d, 1);
 
-       printk("### domain %p: rid=%x-%x mp_rid=%x\n",
-              d, d->arch.starting_rid, d->arch.ending_rid,
-              d->arch.starting_mp_rid);
+       dprintk(XENLOG_DEBUG, "### domain %p: rid=%x-%x mp_rid=%x\n",
+               d, d->arch.starting_rid, d->arch.ending_rid,
+               d->arch.starting_mp_rid);
        
        return 1;
 }

diff --git a/xen/arch/ia64/xen/tlb_track.c b/xen/arch/ia64/xen/tlb_track.c
index 1cbf6126dea3ea57cefb992931288ddca4b56ab6..23b9b61482a1e0c23691f64d976071ce759d0941 100644 (file)
--- a/xen/arch/ia64/xen/tlb_track.c
+++ b/xen/arch/ia64/xen/tlb_track.c
@@ -29,7 +29,7 @@
 #define CONFIG_TLB_TRACK_DEBUG
 #ifdef CONFIG_TLB_TRACK_DEBUG
 # define tlb_track_printd(fmt, ...)     \
-    printk("%s:%d " fmt, __func__, __LINE__, ##__VA_ARGS__)
+    dprintk(XENLOG_DEBUG, fmt, ##__VA_ARGS__)
 #else
 # define tlb_track_printd(fmt, ...)     do { } while (0)
 #endif
@@ -111,8 +111,8 @@ tlb_track_create(struct domain* d)
 
     smp_mb(); /* make initialization visible before use. */
     d->arch.tlb_track = tlb_track;
-    printk("%s:%d hash 0x%p hash_size %d \n",
-           __func__, __LINE__, tlb_track->hash, tlb_track->hash_size);
+    dprintk(XENLOG_DEBUG, "hash 0x%p hash_size %d\n",
+            tlb_track->hash, tlb_track->hash_size);
 
     return 0;
 

diff --git a/xen/arch/ia64/xen/vcpu.c b/xen/arch/ia64/xen/vcpu.c
index a21574ec2b9b984839ae3aa21e5cf0f80b0cde97..09aaaede9c89d70d95e96cf6857796a028cc6583 100644 (file)
--- a/xen/arch/ia64/xen/vcpu.c
+++ b/xen/arch/ia64/xen/vcpu.c
@@ -1017,7 +1017,8 @@ IA64FAULT vcpu_get_cmcv(VCPU * vcpu, u64 * pval)
 IA64FAULT vcpu_get_lrr0(VCPU * vcpu, u64 * pval)
 {
        // fix this when setting values other than m-bit is supported
-       printk("vcpu_get_lrr0: Unmasked interrupts unsupported\n");
+       gdprintk(XENLOG_DEBUG,
+                "vcpu_get_lrr0: Unmasked interrupts unsupported\n");
        *pval = (1L << 16);
        return IA64_NO_FAULT;
 }
@@ -1025,7 +1026,8 @@ IA64FAULT vcpu_get_lrr0(VCPU * vcpu, u64 * pval)
 IA64FAULT vcpu_get_lrr1(VCPU * vcpu, u64 * pval)
 {
        // fix this when setting values other than m-bit is supported
-       printk("vcpu_get_lrr1: Unmasked interrupts unsupported\n");
+       gdprintk(XENLOG_DEBUG,
+                "vcpu_get_lrr1: Unmasked interrupts unsupported\n");
        *pval = (1L << 16);
        return IA64_NO_FAULT;
 }